Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Mon, 11 Jan 2010 07:37:07 +0000 (08:37 +0100)
committerJan D. <jan.h.d@swipnet.se>
Mon, 11 Jan 2010 07:37:07 +0000 (08:37 +0100)
commit3d8a57f9ace36035ef40f4d59687e9f9f1ff7837
tree2e841d6a6c977a0fd5b4c000fb8055334d3a8594
parent3761f597c498df67340a614e4e8a553a183268ee
parentfca68fe734c6bc1bcc7ae6695f7fd9e9bec955cd
Merge from trunk